Upgraded version to 0.6.1