Merge pull request #2 from thomasleyer/master

github for internal use
Merge pull request #1 from mdierker/master

Retrieve Makrus merge