Moztrap 3302

Addresses issue #71.