Merge branch 'master' into John
button is disabled instead of being hidden, also more pertty
Merge pull request #5 from ksolkowski/John

John