Merge pull request #140 from ricardclau/master

reverting change in build script
Merge pull request #141 from ricardclau/master

fix doc and travis build
helper method for splitting time into seconds and microseconds, and use it in both places where needed