Merge pull request #1 from supaFool/master

merged