Update and some cleaning
bump version to v0.3.1