Added interrupt handlers
Merged