working version
Merge branch 'unstable' of https://github.com/borabanjanin/emergency-fall into unstable
working version