Merge pull request #2 from prisis/master

Update to PSR-2, new test function and more
Change travis
Merge pull request #1 from gwa/master

update