Version 0.9 (fixed issue #10)