Updated
Merge branch 'master' of github:philips-august-2014/prep into 20140812150958133
Pushing new changes