Fix BUG!!! Terrible BUG!!!!
Merge branch 'dev'