Merge from fix_file_dir branch, fixes #16 #20

Merged
belliash merged 3 commits from fix_file_dir into master 2018-08-01 16:18:03 +02:00

3 Commits