Fixing bug #2.
Merge branch 'bug-psr0' into develop
Fixed test errors caused by the changes of the file structure (psr-0)
Merge branch 'bug-tests' into develop
Added phpunit to travis.
Merge branch 'feature-1' into develop