bndr Merge pull request #9 from thourfor/master …