Merge pull request #1 from oavitzur/master

a
Merge pull request #2 from oavitzur/ntp

Merge pull request #1 from oavitzur/master