RRRRREFACTORING
Merge branch 'new_library' of ssh://github.com/abarisain/dmix into new_library