added austin's changes
got rid of thread code for now
Merge pull request #25 from NickOttrando/nick

Nick