Merge branch 'master' into timeline
Merge branch 'timeline' of github.com:minkiele/WHIB into timeline