made public methods much better
Merge branch 'develop'