Merge pull request #3 from brandonrninefive/master

Fixing some things
Merge pull request #4 from brandonrninefive/beta

Merge pull request #3 from brandonrninefive/master