Version 1.1.1
1) Did some refactoring.