Fixed Kyle's changes

Made them better.
Merge branch 'master' of https://github.com/landonr/mobilerx