Merge pull request #42 from apophis775/master

Emergency Merge