interrupt logic is functional ...
Merge branch 'issue_14'
Merge branch 'master' into issue_14