adding different button types
Merge branch 'master' of https://github.com/rchoetzlein/luna