Fix conflict with the filesystem package.
Merge pull request #77 from flexiondotorg/master

Fix conflict with the filesystem package.