added mousetrap library
coping in the changes made from test project