modified main and shelter
Merge branch 'dev' of https://github.com/khalua/happitails into dev