Code Cleanup
Merge branch 'master' into continous_read
Bumped version to v0.6a after merges