Added more comments & todo's
Merge branch 'master' of https://github.com/kritts/HandWave-Sample-Apps