Squashed commit of the following:

commit 5a4962856a4b00578236b1ee2eb46f416c350500
Merge: 834ac64 6e9ac94
Author: reneeb <github@renee-baecker.de>
Date:   Mon May 20 08:59:05 2013 +0200

    merge

commit 834ac64491d2a635cfa03c0e7370ad87961fcf4e
Author: reneeb <github@renee-baecker.de>
Date:   Mon May 20 08:57:28 2013 +0200

    added 'xms' to regex

commit 9a5a26e94589b7181a9c8b03b9125dc855bb8e20
Author: reneeb <github@renee-baecker.de>
Date:   Thu May 16 13:47:06 2013 +0200

    improve regex

commit 6e9ac947f3bb974451fec3fd912c6fca1038689f
Author: reneeb <github@renee-baecker.de>
Date:   Thu May 16 13:47:06 2013 +0200

    improve regex