Merge pull request #8 from natcl/master

Sorry, didn't have my coffee yet...