Worked on #101 (can you test and tell me if it works now?)