Last fix - Resolving issue #168
Merge pull request #232 from golicar/master

Last fix - Resolving issue #168