Merge pull request #280 from Kwpolska/master

An annoying line that should be deleted