merge in from master
v0.0.14
merge in from working
bump to v0.0.14
merge in from working