feature: implemented issue #3
feature: implemented issue #3