Merge pull request #4 from pccowboy w/ modifications