Fixed issue #38, making airline happy.
Merge remote-tracking branch 'origin/master'