Merge pull request #1 from TimSchlechter/master

 gdibble:master  <<<  TimSchlechter:master