2012-02-02
========
fixes #1
fixes #2