Merge branch 'hotfix/58' into develop

Forward port #58
Merge branch 'hotfix/controller-options' into develop

Allow setting all options via factory
Merge branch 'hotfix/identifiers' into develop
Merge branch 'hotfix/cs' into develop
Merge branch 'develop' of github.com:pulpfree/PhlyRestfully
minor