First commit. Code form 26 september
Merge remote-tracking branch 'origin/master'