closes #1290, #1289 Change structure to match style-04-06 as proposed by mrkiffie; fix double back slash