Pre-remote merge
Remote merge complete
0.2-beta: Revised project structure and completed major refactoring, landmark 1