smbache Merge pull request #16 from rgknight/master