version 0.3.1
fixed merge conflicts