Added fix for folder reorder issue
Merge pull request #496 from skpcharles/master

Added fix for folder reorder issue