Initial
Little fixes
Merge branch 'master' of https://github.com/vdgtech/ha2