Partial updates + refactoring of makeTree code
Merge pull request #26 from nortikin/master

sync
Small updates
Merge pull request #34 from ly29/master

Partial updates + refactoring of makeTree code