Merge pull request #19 from radai-rosenblatt/master

refactor-out timestamp conversion code, allow for millisecond accuracy