Merge pull request #11 from gouwestadmm/Lexie's-branch

Lexie's branch
master update