Merging 1.0.2 branch to master (1.1.0)

This commit merges the 1.0.2 branch with the master.It includes several changes to the way the store feature is composed in order to drop unnecessary features.