Merge from upstream.
Remove the white margin. (YAML shall be used)
Merge pull request #2 from cookiej4u/master

Merge from upstream.