Pre-release 0.1 FIX