Adapters, Update/render, Exceptions and more
Merge branch 'master' of https://github.com/muit/clipjump