fixes sudweb/2014#35
Merge pull request #36 from borisschapira/master

fixes sudweb/2014#35