Fixed issue #4, added duration to Rest