new tests, some refactoring
Merge branch 'master' of github.com:kirkor/tarnica-mountain

Conflicts:
	README.md