Moving master to develop

Changes from master are now in develop