140717 Merge push
Merge pull request #18 from naddola/master

140717 Merge push