Partially fixes #22; Fixes 'status' computed field, to take extra 6 weeks into account;
Merge branch 'issue-22' into development