Fixed double class typo
Modified all files and created 2 exceptions
Merge pull request #47 from andy2013march/master

Modified all files and created two exceptions