done
Merge pull request #159 from jemaddux/master

My info