20110917

Worked on docs/tickets/45.