fix #3: Issue3 - Update codebase
Merge pull request #4 from snowmantw/issue3

fix #3: Issue3 - Update codebase