this should be the final working version
Merge pull request #14 from kevincol54/master

Code looks good to me.