--comments from face to face today
--changed int to long
Merge pull request #31 from occops/master

--comments from face to face today