Merge pull request #2 from samuelharden/master

Changed 3 things: