fix #66
Merge branch 'fix-find-max'