Added a couple of public helper methods
Mostly there for testing
Merge branch 'develop'