Implmented Feature #19
Fix: #19