Development

Consolidating branches into master