Fix merge issues
Merge branch 'version-0.1' of https://github.com/IoannaP/movienizer into version-0.1