Merge pull request #263 from shawndwells/master

merge from PR 246