some modifications
Merge branch 'master' of github.com:fivespace/miryadom
merge