Merge pull request #16 from alexiri/master

Thanks a lot!