update
Merge branch 'master' of github.com:zawzawzaw/instathreds
updated
fixed conflict