Refactored

First version after merging the brand new refactored code.

Version before refactor 2014

This is the safest version without the brand new refactor improvements.