Rewrote using streams
v2.0.0. Improvement.

- v2.0.0 April 25, 2013
	- Rewrote using streams