Merge pull request #2 from freakr/master

Merge pull request #1 from freakr/work
V0.002
Merge pull request #3 from freakr/work

Work