Merge pull request #19 from naddola/master

140721 Doing push before merge
14070722 Merge push