Fixing some issues
Merge branch 'master' of https://github.com/dxwang/flicksplus