merge some PR's from the original project

binarylogic/settingslogic#74
binarylogic/settingslogic#72