Closes #9
Merge remote-tracking branch 'szabgab/master' into szabgab
cleanup
cleanup