Develop branch merge and service addition

Added services and fixes issue #44