diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 00000000..f51fcc86
Binary files /dev/null and b/.DS_Store differ
diff --git a/got/.DS_Store b/got/.DS_Store
new file mode 100644
index 00000000..2b6aa245
Binary files /dev/null and b/got/.DS_Store differ
diff --git a/got/manager/TweetManager.py b/got/manager/TweetManager.py
index 63d29dd1..8e9ea25b 100644
--- a/got/manager/TweetManager.py
+++ b/got/manager/TweetManager.py
@@ -58,8 +58,8 @@ def getTweets(tweetCriteria, receiveBuffer=None, bufferLength=100, proxy=None):
 				tweet.date = datetime.datetime.fromtimestamp(dateSec)
 				tweet.retweets = retweets
 				tweet.favorites = favorites
-				tweet.mentions = " ".join(re.compile('(@\\w*)').findall(tweet.text))
-				tweet.hashtags = " ".join(re.compile('(#\\w*)').findall(tweet.text))
+				tweet.mentions = " ".join(re.compile(r'(@\s\w*)').findall(tweet.text))
+				tweet.hashtags = " ".join(re.compile(r'(#\s\w*)').findall(tweet.text))
 				tweet.geo = geo
 				
 				results.append(tweet)