Martial arts fix

Signed-off-by: Jonas Engblom <engblom.jonas@gmail.com>
Merge pull request #1 from Hellstar/master

Martial arts fix