Merge pull request #12 from iojamp/master

Merge these batch of nice changes/fixes