Version 1.1
Some refactoring