Massive Code Refactored
Ready to publish 1.1