fixed a few bugs:
Merge branch 'master' of https://github.com/whydna/MotionPictures