Merge pull request #2 from jenkie/master

Oops! Please ignore this...