Fine tuning and bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/com/Leo/mff/MFF.java
Fine tuning and bug fixes