Updates for Walter Ebert
Merge pull request #61 from walterebert/walter_ebert

Updates for Walter Ebert