Added quota support
Merge pull request #716 from dswd/quota

Added quota support