Merge pull request #158 from TamaraAtanasoska/master