simple updates
Merge pull request #140 from bobbywarner/master

Simple Updates