Version 1.1

Improved code structure.