Fixes #7, added filesystem support