Merged in changes from dflemstr (thanks!)