tiny modification
merged conflicts
fixed the bug in SRL training suite