Merge pull request #26 from sarality/master

Merging changes from Master