Merge pull request #229 from theponti/master

Merge from master