Merge pull request #44 from graimundo/master

UX fixes