Fix for bug #3
Prepare 2.1.1 release