Merge pull request #2 from cinder1992/master

Pull 01