adding platform and os (ref: #513)
Merge remote-tracking branch 'origin/dev' into dev