diff --git a/PyLyrics/functions.py b/PyLyrics/functions.py
index e4c7e19..d656e01 100644
--- a/PyLyrics/functions.py
+++ b/PyLyrics/functions.py
@@ -3,35 +3,41 @@
 import sys, codecs, json
 
 class Track(object):
-	def __init__(self,trackName,album,artist):
+	def __init__(self, trackName, album, artist):
 		self.name = trackName
 		self.album = album
 		self.artist = artist
 	def __repr__(self):
 		return self.name
+	def __str__(self):
+		return self.name
 	def link(self):
-		return 'http://lyrics.wikia.com/{0}:{1}'.format(self.artist.replace(' ', '-'),self.name.replace(' ','-'))
+		return 'http://lyrics.wikia.com/{0}:{1}'.format(self.artist.replace(' ', '-'), self.name.replace(' ', '-'))
 	def getLyrics(self):
-		return PyLyrics.getLyrics(self.artist,self.name)
+		return PyLyrics.getLyrics(self.artist, self.name)
 class Artist(object):
 	def __init__(self, name):
-		self.name = name 
+		self.name = name
 	def getAlbums(self):
 		return PyLyrics.getAlbums(self.name)
 	def __repr__(self):
 		return self.name.encode('utf-8')
+	def __str__(self):
+		return self.name
 class Album(object):
-	def __init__(self, name, link,singer):
+	def __init__(self, name, link, singer):
 		self.year = name.split(' ')[-1]
-		self.name = name.replace(self.year,' ').rstrip()
-		self.url = link 
+		self.name = name.replace(self.year, ' ').rstrip()
+		self.url = link
 		self.singer = singer
 	def link(self):
-		return self.url 
+		return self.url
 	def __repr__(self):
 		if sys.version_info[0] == 2:
-				return self.name.encode('utf-8','replace')
+				return self.name.encode('utf-8', 'replace')
 		return	self.name
+	def __str__(self):
+		return self.name
 	def artist(self):
 		return self.singer
 	def tracks(self):
@@ -41,59 +47,61 @@ class PyLyrics:
 	@staticmethod
 	def getAlbums(singer):
 		singer = singer.replace(' ', '_')
-		s = BeautifulSoup(requests.get('http://lyrics.wikia.com/{0}'.format(singer)).text)
-		spans = s.findAll('span',{'class':'mw-headline'})
-		
+		s = BeautifulSoup(requests.get('http://lyrics.wikia.com/{0}'.format(singer)).text, 'html.parser')
+		spans = s.findAll('span', {'class':'mw-headline'})
+
 		als = []
-		
+
 		for tag in spans:
 			try:
 				a = tag.findAll('a')[0]
-				als.append(Album(a.text,'http://lyrics.wikia.com' + a['href'],singer))
+				als.append(Album(a.text, 'http://lyrics.wikia.com' + a['href'], singer))
 			except:
 				pass
-		
+
 		if als == []:
 			raise ValueError("Unknown Artist Name given")
-			return None
 		return als
-	@staticmethod 
+	@staticmethod
 	def getTracks(album):
 		url = "http://lyrics.wikia.com/api.php?action=lyrics&artist={0}&fmt=xml".format(album.artist())
-		soup = BeautifulSoup(requests.get(url).text)
-
+		soup = BeautifulSoup(requests.get(url).text, 'html.parser')
+		currentAlbum = None
 		for al in soup.find_all('album'):
 			if al.text.lower().strip() == album.name.strip().lower():
 				currentAlbum = al
 				break
-		songs =[Track(song.text,album,album.artist()) for song in currentAlbum.findNext('songs').findAll('item')]
-		return songs
+		if currentAlbum is not None:
+			songs = [Track(song.text, album, album.artist()) for song in currentAlbum.findNext('songs').findAll('item')]
+			return songs
 
 	@staticmethod
 	def getLyrics(singer, song):
 		#Replace spaces with _
 		singer = singer.replace(' ', '_')
-		song = song.replace(' ', '_')
-		r = requests.get('http://lyrics.wikia.com/{0}:{1}'.format(singer,song))
-		s = BeautifulSoup(r.text)
+		if ( isinstance(song, str) ):
+			song = song.replace(' ', '_')
+		elif ( isinstance(song, Track) ):
+			song = song.name.replace(' ', '_')
+		r = requests.get('http://lyrics.wikia.com/{0}:{1}'.format(singer, song))
+		s = BeautifulSoup(r.text, 'html.parser')
 		#Get main lyrics holder
-		lyrics = s.find("div",{'class':'lyricbox'})
+		lyrics = s.find("div", {'class':'lyricbox'})
 		if lyrics is None:
 			raise ValueError("Song or Singer does not exist or the API does not have Lyrics")
-			return None
 		#Remove Scripts
 		[s.extract() for s in lyrics('script')]
 
 		#Remove Comments
-		comments = lyrics.findAll(text=lambda text:isinstance(text, Comment))
+		comments = lyrics.findAll(text=lambda text: isinstance(text, Comment))
 		[comment.extract() for comment in comments]
 
 		#Remove unecessary tags
-		for tag in ['div','i','b','a']:
+		for tag in ['div', 'i', 'b', 'a']:
 			for match in lyrics.findAll(tag):
 				match.replaceWithChildren()
 		#Get output as a string and remove non unicode characters and replace <br> with newlines
-		output = str(lyrics).encode('utf-8', errors='replace')[22:-6:].decode("utf-8").replace('\n','').replace('<br/>','\n')
+		output = str(lyrics).encode('utf-8', errors='replace')[22:-6:].decode("utf-8").replace('\n', '').replace('<br/>', '\n')
 		try:
 			return output
 		except:
@@ -101,10 +109,10 @@ def getLyrics(singer, song):
 
 def main():
 	albums = PyLyrics.getAlbums('OneRepublic')
-	print (albums)
+	print(albums)
 	tracks = PyLyrics.getTracks(albums[-1])
-	print (tracks[7].getLyrics())
-	
+	print(tracks[7].getLyrics())
+
 
-if __name__=='__main__':
-	main()
\ No newline at end of file
+if __name__ == '__main__':
+	main()