Update
Merge branch 'master' of https://github.com/tjuuljensen/poseidon
Merge branch 'master' of https://github.com/tjuuljensen/poseidon

Conflicts:
	README.txt
Memory leak testing