Almost done.

woho.
Merge pull request #61 from juree/master

almost done.
Merge pull request #11 from ipri2013/master

Updating my fork, almost done