Fixed bugs #1, #2, #3, #4 in Github