Clarification for test
Documented LD_LIBRARY_PATH for Linux
Merge branches 'dev' and 'master'