fixed issues: #15