Bb 0.9.10x

See issue #28

Also, I should of flattened this branch down. It has a bunch of back and forth edits. I suck at git tonight.