Merge pull request #114 from johnnyrun/master