Fixed some of the problems mentioned in issue #27

* sweble-wikitext 305d3a5...121d2af (1):

    commit 121d2af964108b9550f99e32d7b0df5145108a57

        Fixed some of the problems mentioned in issue #27