Added some more comments
Did some small refactorings
Merge remote-tracking branch 'origin/master'