Merge pull request #1 from devbego/master

Pull?
Fixed Some Shtuff
Merge pull request #2 from Luxapodular/master

Schtuff