first feature

merge again first-feature (I'm fixing broken master)