Minor changes. Fixed bug in mapping this closes #9.