done today
Merge pull request #3 from ryanquinn3/master

done today