Dev -> Master

Some refactoring with Dr. A.