Merge branch 'master' into development
making method signature fit in one line
second attempt at making signatures fit in one line