cleanup
added V0.6