Merge pull request #66 from alexsong93/cpu-fix

Fix cpu issue when gateway starts up