Merge pull request #1 from freakr/work

Initial Commit
Merge pull request #2 from freakr/master

Merge pull request #1 from freakr/work