Merge pull request #10 from snoppy911/master

Marge changes