Improvements
Merge pull request #14 from ajile/master

Improvements