https://issues.jboss.org/browse/SRAMP-265
Merge pull request #386 from KurtStam/master

https://issues.jboss.org/browse/SRAMP-265