Merge pull request #136 from FreakC/master

Issue #134