Merge pull request #485 from am11/master

Misc. Fixes