Updates from Issues #8, #14 & #20
Merge pull request #26 from churchio/todos

Updates from Issues #8, #14 & #20