First commit for 2014 :-) - Fixed Sonar violations..