Merge pull request #158 from romibi/master