Merge pull request #22 from TravisEvashkevich/master

Merge Feature
Fix for hierarchy of folders showing up when they're new (parent and all it's children down the line.)
Merge remote-tracking branch 'upstream/master'