Beta

Merging brances without losing the history