Attempt to fix issue #29
Merge branch 'master' into cleanup