corrected spelling
Merge branch 'master' into am_register_history