Fixed some minor issues and incremented the version