Thread 2fc4f972

Here is gist of the script with both fixes applied: https://gist.github.com/1204446