Merge tag '0.1.3' into develop

0.1.3