Issue/12

fixed the issue #12