incorporated mmparker changes, fixes #6 and #7