upgraded 0.1.8 for distribution