Merge pull request #146 from benapetr/master