Merge pull request #248 from svost/ntp