Make regex better and use word boundary
Use atmosphere 2.0.2