WIP, committed for backup purposes.
Merge branch 'master' of https://github.com/vsudilov/grondview