minor fixes
Stable version 0.2-SNAPSHOT