The bug of issue 184

This pull has the fix of issue #184 .

I'm also improving the Record-Me mode a little.