Merge pull request #1 from mnalis/master

Pull request