Merge pull request #256 from zijistark/beta

2.2.1.1 CBs
Patched plot events
Updated 00_traits for WoL