merging pull request #87 into develop
making getHeaders return a unmodifiable map
Fix NPE because headers is never initialized