Added interrupt handling support
Removed binary left overs