Merge Fixes for Issue #1

Change time unit order