Merge pull request #78 from wtangiit/master

minor fix/updates