Fix for issue #464

I believe that this will fix #464.  

I know it is bad form to include my merge in a pull request, but the merge was already done on my repo and fixing this issue should be a simple evolution and isn't worth cloning and downloading the entire repo for.  feel free to make the changes yourself to keep history clean.