just updated :(
improve startup time. cleaned up code
fixed wrong merge