Merged in #9 changes, and fixed a few things for 1.0.0