Very minor code cleanup
Bumped version to 0.1.1
Fixed conflict version number