First version
Added hungarian option
Small changes