Changed order of member declarations to avoid GCC warning.
Merge branch 'master' of github.com:harrism/hemi