Merging develop in to master

Added methods to get the current device object.