fix #3: Issue3 - Update codebase