change swap to M for consistency. Closes #63.