updates
Merge branch 'master' of github.com:pierot/termieter

* 'master' of github.com:pierot/termieter:
  updates
merge