updated for 0.9.x
Merge pull request #3 from jessehorne/0.9.x

updated for 0.9.x
updated some things