Merges current work

fixes #2