added scrypt
fixed puma stop
updated for god
Merge branch 'master' into beta