updated significantly - new version 0.1.1