Merge pull request #2 from ipri2013/master

update fork.
almost done :)
Merge pull request #58 from juree/master

Almost done. Bugs?...