Fix the kill error when running for the first time#2

Open

gonrial wants to merge 3 commits intoumermansoor:masterfrom

gonrial:patch-1

Commits on Dec 2, 2015

Fix the kill error when running for the first time
gonrial
committed

Commits on Dec 6, 2015