Change code to compile gcc 4.6.3 (for Raspberry pi)
Merge branch 'feature/raspi' into develop