Add TODO/Wishlist
Merge pull request #28 from dandv/patch-1

Add TODO/Wishlist