Version 1.0: Merge dev