Upgraded version to 0.1.6