Merge pull request #38 from nnfuller/master

Update nathan branch
Real fix time.
Merge pull request #39 from nnfuller/nathan

Toggle button functionality added.