Fixed some bugs.
Merge branch 'master' of https://github.com/jonkjenn/Ambiguous

Conflicts:
	Ambiguous/.classpath