Update docs
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/dev'
Update readme
Merge remote-tracking branch 'origin/dev'
Merge remote-tracking branch 'origin/dev'
dos2unix fix

?!?
???
Merge remote-tracking branch 'origin/master' into dev