cleaned and ready for 0.1.8