Fixed compile error

in main.cpp 414 Initilising structure was invalid when compiling on
PI with Debian Wheezy.
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'nafets227/master'

Conflicts:
	src/main.cpp