updated normandy. this fixes also issue #17 and #18.
Merge branch 'tohklidan'