Fixed YAML order

Fixed YAML serialization order with this trick: http://stackoverflow.com/a/8661021
Merge remote branch 'origin/master'