Clean
Update all
Merge pull request #174 from adanilyak/master

Alexander Danilyak, FileMap, 297