V0.3
*new work version*
Merge pull request #1 from freakr/work

V0.3