cblgh Merge pull request #3 from cblgh/master …