Made log files appear in own subdirectory
Merge remote-tracking branch 'origin/master'
Refactored all variable names to lower case with underscore
update .idea