fix for BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1021313
Merge pull request #21 from EricWittmann/master

fix for BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1021313
fix for: https://issues.jboss.org/browse/SRAMP-257
Merge pull request #22 from EricWittmann/master

fix for: https://issues.jboss.org/browse/SRAMP-257