Merge nordenfelt work

Merge work on Nordenfelt