wip
Merge branch 'develop' of github.com:kolov/notipy into develop