refactroring for release of 1.1.0