fix
Merge branch 'master' of github.com:DeRain/hackaton
various changes
various changes