Added proper domain matching
Version 0.2.0