Fix bugs introduced in the latest fix
Setting version to 0.4.1
Setting version to 0.5.0-SNAPSHOT