Revert "Stable version"

This reverts commit 03a63ea4c1f0700398598fcceac9ff7f3eeab3db.
Revert "Stable version"

This reverts commit 03a63ea4c1f0700398598fcceac9ff7f3eeab3db.
Worst bug ever fixed o.O IDK wtf did I do
Merge branch 'master' into staging