[master] Change to fenced code
Merge pull request #25 from kevinleeone/master

[master] Change to fenced code
Merge remote-tracking branch 'upstream/master'