Fixed async problem
Merge branch 'master' of github.com:darcyclarke/DSS