Merge pull request #93 from dannybutler/master

Fixed various working period issues (bug #59407946)