update to v0.6 mergine from @trmfreitas for bugfix and  option