finished v0.0.6.beta2
Merge pull request #4 from serv/v0.0.6

finished v0.0.6.beta2