Cleaned up some logic should work
 -- and
fixed      the s p a c i n g for rayu :D
--- Trincer
Merge pull request #84 from Tincer/master

Logic improved and spacing fixed