Exception
Merge pull request #99 from rbrueckner93/Nils_V1

Exception