Fixed multithreading, hopefull now the app is go-get able