Pulling develop into master

We have made many changes. We are updating master with the new functionality.