Settings updated, local builder addressed
Merge pull request #102 from lukashaertel/master

Settings updated, local builder addressed, addresses #97, fixes #82