Merge pull request #222 from am11/master

Reorganized "using" with "Place System directives first"
Fix #212
Merge pull request #226 from SLaks/build-error-fix

Fix #212
v1.3.1
Corrected a variable name