14070722 Merge push
Merge pull request #20 from naddola/master

14070722 Merge push