Merge branch 'master' into scoop-develop
Update readme and startup scripts

Signed-off-by: Jeremy Ho <jujaga@gmail.com>