added Mousetrap and Apache v2.0