Implemented more extended attributes
auto-merge staging into master