Merge pull request #20 from btaidm/master

Fixed the moved source problem
Merge pull request #21 from btaidm/master

Server starts in seprate thread and everything closes properly. Yay