FIX: include str-int in load-int
Merge remote-tracking branch 'origin/master'