ivaldi/brimir — pull request #19 by basschoen (2013-08-09 14:32:08+00:00)
Title: Fixes #16 and #17 with tests

Fixes #16 and #17 with tests