merge in from working
merge in from working
merge in from working
updated to use default names
bump to v0.0.16
merge in from master