Fix General Bug
Merge branch 'dev'