1.2.1 version
Merge pull request #16 from ajile/master

1.2.1 version