Tests
Merge pull request #1 from DuXeN0N/master

Tests