Feature/osgi