Added everything
Merge pull request #649 from citruspi/master

Added everything