0.7.1

Fixed merge