code improvements
v0.1.1 - closed #3