Merge pull request #199 from isaacfreeman/1.0.x

Fixed some issues