Developmental Merge

Merge the developmental branch after completing the basic tutorials