Merge pull request #333 from wilman0/master