Slight modification and upgrade to 0.2.3