First step
Merge branch 'master' of github.com:ponpal/imagine