merged version 0.3 to master