Merge branch 'dev'
refactoring reshape(..., how:String)
Merge branch 'master' into dev
changing to axis