Merge pull request #1 from mogui/master

Pull original changes
Merge pull request #30 from Ostico/master

Merge pull request #1 from mogui/master