Getting code cleaned up and docs prepared for 0.2.0