changes for windows
Merge remote-tracking branch 'origin/master'

Conflicts:
	CMakeLists.txt
Fixed segfault

The display thread was reading the instruction whilst it was being
update.