Merge pull request #3 from sej7278/master

Various changes