Upgraded to version 0.6-SNAPSHOT