Fix #15
Merge branch 'issue15'