Fix bug not expanding namespace. Added test. Updated version.