Whoops.
Merge pull request #2 from davidcernat/master

Sorry, I forgot to save in Eclipse when I made my last commit