aug 2014 update
Merge pull request #20 from cmager/master

aug 2014 update