Fixes for #61 also fixes #47, with tests to prove so
Fixes for #61 also fixes #47, with tests to prove so

MichaelRFairhurst/wake-compiler,MichaelRFairhurst/wake-compiler,MichaelRFairhurst/wake-compiler,MichaelRFairhurst/wake-compiler