03/04/14

Updated thread handling in main controller