#31 Switched to real Lupa library now that changes are merged in