A few minor changes to enable the subclassing I did
Merge branch 'develop' of github.com:parworks/PARWorks-iOS into develop