Yet another merge issue fix
Merge pull request #35 from seavor/polina

Yet another merge issue fix