Merge pull request #54 from EricWittmann/master

Partial fix for: https://issues.jboss.org/browse/RTGOV-412