Initial running version, in order to fix #1