Added author credits and language fixes
Code cleanup
Merge remote-tracking branch 'origin/master'