Merge pull request #95 from tkrugg/master