Fixed long term goal bug
Merge branch 'dev'