ecomba/collaborator — pull request #32 by hoongman (2013-05-22 11:31:34+00:00)
Title: merged changes from Keir

merged changes from Keir