Merge pull request #232 from svost/solution-ntp