Fix the bug after fixing the merge.
Merge pull request #2 from aikimcr/FixMyBugs

Fix the bug after fixing the merge.