bug FIXED in master
resolve merge confilct
added note v2