Fixed some critical issues
Merge branch 'master' of https://github.com/foxontherocks/pencil