kori changes
Merged master into funtimes and resolved merge conflicts.
Merge pull request #2 from tararoys/funtimes

kori changes