Fixed bugs, generate pot file and other improvements. This fixes #2. This fixes #3