Issue Fixed: #4