Prepared for version 1.0.4