more updates
Merge pull request #6 from mhansbury/master

more updates