Merge pull request #1 from iphelix/master

Pull req