Refix and remove prototype

Everything is fine and without prototype... @braiam : I commit it,
please merge if OK!
Merge branch 'feature/prototype' into develop

* feature/prototype:
  Refix and remove prototype