Merged in Derek Eder's changes issue #123