Fix for REF-94

http://issues.osehra.org/browse/REF-94
Fix fore REF-99

http://issues.osehra.org/browse/REF-99
Latest Plugin Deployment Build: 0.0.509