Merge pull request #2 from Ayrx/master

Timeslot // Watermarks // Changed Module Path