Johannes awesome improvement.
Merge pull request #1 from alneberg/master

Johannes awesome improvement. Auto?