Merge pull request #1 from panesofglass/master

Formatting and Package Reference Fixes