Improved fix of issue #1, general interface improvement