Merge pull request #152 from hadik3r/master