Fix the issue #26
resolving merge