Merge pull request #53 from wtangiit/master

misc additions