Stuff to do

Signed-off-by: Daniel Shumway <shumway.danny@gmail.com>
Merge pull request #115 from danShumway/master

Stuff to do