Merge dev-master into master
Attempt to resolve bug when disabledEncoder hasn't been set.
Merge pull request #65 from scottpurdy/master

Attempt to resolve bug when disabledEncoder hasn't been set.