Solved issues: #64 & #65