adding alexander beletskys contributions to 0.1.1