Some refactorings. Version updated to 1.1.1
Some refactorings. Version updated to 1.1.1
Merge pull request #1 from ikamman/master

Some refactorings