Merge pull request #37 from netomi/develop

Proposal to fix issue 36: area stack glitch.
fix and cleanup formatting
format
Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop