major bug fix possibly...
Merge branch 'master' of github.com:cadejscroggins/omgcatz