Merge pull request #143 from theponti/master

Merge from master