Merge pull request #1 from cbarcenas/master

Merge ASF Exporter with master branch
More style fixes