Version 6.0

please merge version 6.0