Fixes #5
Updated changelog and todo list