Merge pull request #391 from pfaffman/master