fix #30 (Iris version) and fix #31 (source code)