Finished function parsing
Merge branch 'master' of https://github.com/manpat/bear