master update
Merge pull request #13 from gouwestadmm/Lexie's-branch

master update with lexies branch