Merge pull request #20 from ajile/master

Improvements