Now with exceptions!
Merge branch 'master' of https://github.com/Weedlepickles/SMART.git