[Fix] - Fix the bugs
Merge branch 'master' of github.com:migocorp/athena