july 2014 update
Merge pull request #19 from cmager/master

july 2014 update