initial changes (27/12/2014)
Merge changes