theodesp Merge pull request #2 from Xeoncross/master …