fixed #12 - adding support for the new MPS