helun/Ektorp — pull request #149 by yaronyg (2013-12-06 00:51:19+00:00)
Title: Fixes for issues #146 and #144

Please see issues #146 and #144 for details.