Refactored interrupts
Merge pull request #1 from reenigne/master

Refactored interrupts