Merge pull request #37 from johnnyFiftyFive/master

Commit
file lock
file lock
file lock
file lock
file lock
file lock
file lock
file lock
file lock
file lock
file lock
file lock
Merge pull request #38 from Explicite/explicite

issue #11
Dodanie buffora