update22
Merge branch 'master' of https://github.com/PavL1080/odin-sbeard

# By thboomsma
# Via thboomsma
* 'master' of https://github.com/PavL1080/odin-sbeard:
  again