Merge pull request #32 from drlube/master

Changes when scheduling not available. Tag tweaks.