Tons of features and refactoring from ownself branch

Update features since Jun 10, 2014