use simple methods
Merge branch 'issue-22' into develop