finished v0.0.6.beta3
Merge pull request #5 from serv/v0.0.6

finished v0.0.6.beta3