changes from development, includes latest updates
merged