v0.5.4
Merge branch 'develop'
fixed element type
fixed element type
removed CPPFLAGS
Merge branch 'develop'
removed CPPFLAGS