Merge pull request #1 from barsoom/master

Pull
Prep for release 0.0.5.
Use the class methods to ensure they work.