Fixes #21
Merge branch 'develop' into sped
Fix static constant declarations