Paul changes from 2014-03-27
Merge pull request #9 from pmur002/master

Paul changes from 2014-03-27