Merge pull request #59 from unixorn/master

Merged #57