Updated include order for consistency.
Merge branch 'master' into command-line-options

Conflicts:
	main.cpp
Added typedef