bugfixes
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.project
Merge pull request #3 from ChiSamurai/master

bugfixes