some integration
Merge branch 'master' of github.com:Clipsy/clipsy