20110917ΒΆ

Worked on docs/tickets/45.