Fix #12
Merge branch 'master' of https://github.com/the-open-university/kiskit