Work branch

Merging work branch, because it is farther ahead than master.