Some errors left
Merge branch 'search' of github.com:batspirit/Imagine into search