Issue: #10 - Fixed