Fix for small merge issue
Merge pull request #272 from szprutamich/master

Fix for small merge issue