Issue #5
Merge branch 'master' of github.com:NICTA/course
Rename flaatten to flatten'
merge with upstream