Astyle formatting
Fix the stupid PIN bug.
Merge remote-tracking branch 'upstream/master'