Fixed issue #12.
Merge branch 'develop' of https://github.com/despondentdonkey/bpm into donkey