Fixed commit bugs after merge pull request #6