Added minor fixes (Fixes #1).