Merge pull request #8 from joelcoxokc/master

Update: Fix bug problems
Merge pull request #9 from Clurtchio/dev

Dev