Fixed issue #7
v1.6.1