changed order of functions in .hpp and .cpp
new patch - v0.5.8-alpha