Merge commerce branch into master (later)

merging of master into commerce branch. merging to start work on #115