Merge pull request #33 from aso2101/master

Apparatus styling
Merge remote-tracking branch 'upstream/master'