V1.1 changes.

Bugfixes and additional options added.