Almost done.

woho.
Merge pull request #61 from juree/master

almost done.