Merge pull request #3 from benjello/master

fix 2009 bug. 2008 still buggy