make more generic
Release 0.1.1