Merge branch 'development' into task_manager
Implement a basic TaskManager.

Closes #7
Merge branch 'development' into task_manager