Merge pull request #101 from bketelsen/master