june 2014 update
Merge pull request #18 from cmager/master

june 2014 update