really tired of fighting newline characters
Merge branch 'master' into framework