Merge pull request #131 from knocte/master