Merge pull request #6 from brain0/working

Working