Merge pull request #9 from wroy/master

Fixed Unity Exceptions