Bug fix (millies == 0?)
Merge branch 'devel_ek'