some cleanup
version shifted to 0.3.1