Merge pull request #56 from creativelive/master

core buttons
Merge pull request #57 from creativelive/core

Merge pull request #56 from creativelive/master