Quick fix for availability
Merge pull request #5 from jkappers/availability_bugs

Quick fix for availability