inital commit
Merge https://github.com/dsr87/lion