Merge pull request #3 from brain0/working

Working