code cleanup
Documentation update
Bump development version