Merge pull request #4 from Mirantis/one-pass