- added property-output on build
Merge origin/master