Resolves #9.
Resolves #2.
Resolves #3.
Resolves #4.
Resolves #8 and resolves #11.
Resolves #12.
Resolves #7 and resolves #8.
Merge pull request #16 from guillermoandrae/2.1.0

2.1.0