Merge pull request #98 from MarvinKlemp/cleanup

[WIP]Minor cleanup

Merge pull request #88 from MarvinKlemp/fix/composer

Fixed composer.lock

Merge pull request #57 from MarvinKlemp/fix_testdir

Moved test dir

Merge pull request #44 from derrabus/php53-compat

Removed more usages of the short array syntax