Merge pull request #4 from kouvelas/master

This is a major pull-request
Merge pull request #5 from kouvelas/master

pull please
small bug fixes