Merge pull request #1 from MoveLife/ThomasMaurer

Thomas maurer