Merge pull request #472 from ey6es/master

Fix for segmentation fault in readSettingsFile.
Merge pull request #473 from ey6es/master

Fix for compile error that Clement encountered.