Fix catch upper case as type recognition. Closes #525
add more test cases for issue #525
Merge pull request #534 from CodingUnit/master

Fix catch upper case as type recognition. Closes #525