Merge pull request #301 from mhils/alpn-decorator

Always use alpn decorator