Bug #278 fixed.
Merge pull request #293 from gogolander/test

Bug #278 fixed.