Merge origin/master

Conflicts:
	src/main/java/nac/mp/MathParser.java
Merge origin/master