Added extra saftey checks to directories before use
Merge branch 'master' of github.com:Nekroze/librator