Made str_unarmor() compatible to windows and linux line endings
Merge branch 'master' into testing