pull 0.3.1 changes forward to my branch