Fixed double class typo
Merge pull request #46 from jkuk/master

Fixed up some things
Modified all files and created 2 exceptions
Merge pull request #47 from andy2013march/master

Modified all files and created two exceptions