adding short, long functions
Merge branch 'master', remote branch 'origin'