Merge pull request #31 from GtakillerIV/master

Some Code Changes