Merge nordenfelt work