More improvements.
Merge pull request #28 from benastan/features/roommates/21

#21: More improvements.