Adirelle:
	- Fixed tickets #11 and #12.
