Fixes #492
Conflicts:
	src/services/services.ts
Return undefined instead of null.
Merge pull request #493 from RReverser/patch-1

Fix for importing modules from definitions