Added bugs.
typo
Merge branch 'master' into cmake

Conflicts:
	src/main.f90