hard onset improved
Merge branch 'origin/master'