Merge pull request #4 from cyrozap/master

Mostly UX improvements