fix error during merge
Merge pull request #76 from loki36/dev

fix error during merge