Merge pull request #427 from nwinklareth/v2.0-dev

Issue #426 - added code to properly calculate beginning of day and end o...
Merge pull request #428 from nwinklareth/v2.0-dev

Issue #426 - fixed broken tests