Fixed minor issues with code and released 1.0.8