Merge pull request #33 from cme3888/master

expand button changes