Merge branch 'master' into dibel-develop
small updates
	modified:   main.cpp
	modified:   view.cpp
Fixed crashing on Windows
Merge branch 'dibel-develop'

Conflicts:
	view.cpp