Feature 122

Fixes:

http://bugs.openmw.org/issues/122
http://bugs.openmw.org/issues/669