Merge branch 'isint' into no_crash

I've forgotten to pull the repo and made changes.
Then I was lazy to recreate them after pull and I thought
it would be easier to merge the changes.

diff --cc Makefile
Simple merge