Merge pull request #19 from afortune906/master

Are there any problems?
Merge pull request #20 from afortune906/master

brians changes
april 16 changes