directive parsing
auto-merge staging into master