Updating to master after some bug fixes