polished up version 0.1.1