Merge pull request #47 from teancom/master

woot!
oops!