Merge pull request #14 from sorflex/master

Unit tests working