#39: fixed bugs and Junits to prepare release