Merge pull request #1 from abnerm/master

refactored
derped on the heart shape**fixed