Merge pull request #1 from lukaszjwysocki/Development

Made regex go brrr