Done
Merge pull request #15 from bblaga/master

Done