Fixing bug when adding a clip
Merge branch 'master' of https://github.com/aurer/clips