Merge pull request #19 from ZomgPonies/master

Merge From Master
ParaPen Fix

Fixes Parapens and removes extra code
Merge pull request #436 from Fox-McCloud/ParaPen-Fix

Para pen fix