ready for recursion for real
ready for some more structure, joel?
Merge pull request #1 from hunandh/master

updating from source repo