Fixes #9 and revs for 0.0.2