Merge pull request #23 from C-Compton/ALPHA

Merge pull request #22 from C-Compton/master
Submit and Cancel buttons 'work' better.
Merge pull request #24 from C-Compton/dev

Submit and Cancel buttons 'work' better.
Merge pull request #25 from C-Compton/master

merge master to alpha