Merge pull request #19 from skorokithakis/master

Merge to master