Issue191

@brettweavnet, @thbishop, and @rickmendes take a look at this and let me know if I am going down the right path.  I have done some basic testing and it appears to function as desired.  Though I did not do a full regression test on it.