Rev 0.4.1.0

Commit before going to Italy summer 2014