Merge pull request #392 from ping19/master

Couple updates plus fixes