Fixed #189
Manually merged #187
Bump to 1.2.5
Remove dist after release