Merged Pull Request #97 from misfo. https://github.com/sublimehq/Vintage/pull/97