Merge pull request #313 from tiwilliam/master