Development/Naked: Updated for version 1.0.1