Merging master and spec branches