New Test and merge conflict resolution
Merge pull request #22 from Solderea/unstable

New Test and merge conflict resolution