Upgraded and cleaned up project.
Merge pull request #28 from Bo98/project-update

Upgraded and cleaned up project