ReSharper changes
Merge pull request #2 from Thobias83/master

ReSharper changes