shintetn
Add new method
Merge remote-tracking branch 'origin/development' into shinetech
def
Merge from development