Implemented issue #24 [Issue 24]