Resolved issue #49
Removed temporary handler file