Iterator seems to be working
Merge branch 'master' of github.com:taysom/tau