Merge pull request #69 from arax/master

Applied changes from ed0b2f88855 to master