Merge pull request #71 from loganwatanabe/mobile

Updated with everything in master now in this branch
merging