Sould fix projection issue mentioned in #12
Merge branch 'refs/heads/master' into 2.1.0

Conflicts:
	Makefile