Crear/merge/big cleanup rebased

This is #68 rebased again.

<!---
@huboard:{"order":10.5}
-->