Fixed bugs and changed some method names. This will break compatibility!  Bumping to 0.1.0