merge changes from @udp3f pull request - issue 98