am hi
Merge remote-tracking branch 'origin/master' into Johan26-02

Conflicts:
	InputException.java
Merge pull request #6 from Gebuz/Johan26-02

Johan26 02