Merge pull request #17 from JunJayMdM/master

YieldAllAlarms revisited