Added unit tests
Bugfixes
Committing implode to HEAD
Merge pull request #6 from paul-vg/dev/v2

Unit tests and bug fixes