Addressed issue #67