april 16 changes
Merge pull request #22 from afortune906/master

april 16 changes