Added Freeez
Merged with master
Fixed bug
Merge branch 'master' into FreeezDev