Junittest

Merged Junit branch to master. should resolve #39