Add more hints for what I want to say
Extend things a little bit
Merge branch 'dev'