Better parsing
Cleaned up if-else
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/MessageParser.java
Bugfix