working version
Merge pull request #37 from hewolf/master

working version