Merge pull request #3 from npostavs/current

simplifications and fixes