-Cleaning up code
- bug fix
-hot fix
Merge branch 'hot-fix'