Updated to fix #13