Merged bug fixed from 1.0.4