memory bug fixed
Merge branch 'master' into dev
memory till buggy