temp
merging with develop
finished version, with all modifications
new branches are added and SPE is implemented.
Merge remote-tracking branch 'origin/develop' into mengyx
Better zero-suppression, which resulted in many bug fixes.
Minor changes.