Update Issues #5, #15, #16 & #21
Merge pull request #27 from churchio/Todos-II

Update Issues #5, #15, #16 & #21