Added my lines to files
Merge remote-tracking branch 'sk/master' into devel