merge in from master
v0.0.17
merge in from working