Tested and fixed bugs that I found
Merge remote-tracking branch 'origin/master'