Version 1.0.4. Fixed Warnings