Cleaning Jamoma .h and .cpp
merge