I made this commit just for Nic
Merge pull request #1 from makrohn/nicktest

I made this commit just for Nic