src&tests
Merge pull request #1 from oceanicbo/tests

src&tests