Updated changelog
Updated Changelog
Merge branch 'develop' of https://github.com/nmeum/spm into develop