Updated for OSS release
Merge branch 'master' of https://github.com/sangupta/lineup.git