Merge pull request #1 from meyerjp3/master

sync June 27,2014