Fixed Issue #16 #17 #18.
Changing version to 2.1.1.