debug option fix
bump version
merge commit
merge commit