bug fixes to sample code
Merge branch 'master' of https://github.com/NICTA/fsdf-hackfest