First Merge

First merge between dev and master.