Options implemented. Version bumped to 1.6