aschnell Merge pull request #546 from aschnell/master