Version 1.1.0
 - refactoring