0.5 (fixed #5 and #6)