Merge pull request #2 from er777/current

Current