Merge pull request #27 from sli-fox/marky_branch

Marky branch
fixing crash on play button
Merge pull request #28 from sli-fox/jeremy

fixing crash on play button