Merge changes from eggsempler/store