Split in to sub function
Updated tests
Merge branch 'master' of github.com:codles/APES

Conflicts:
	test/APES.jl