unlcms/tims — pull request #14 by tsteiner (2013-07-18 15:26:02+00:00)
Title: Closes #13

#13

Do this after #1 and #4