Merging changes between sonke's repo and mine