Merge pull request #154 from avigdork/master

seretil 2.1.2