[v.1.0.1.1] Ready to release

Small fixes for the founded bugs.