Fixed a feature
Ditz-issue: 40f1cbd06172873a685e90266f7d28c41a5a1803
Claimed issue
Update gitignore
Merge remote-tracking branch 'origin/master' into update-logging