Merge pull request #28 from vuongaustin/master

Merge pull request #3 from TheMacLab/master
Merge branch 'master' into dev-forest