iceeagle:
	- fixed ticket #3
	- fixed bug #2
