Merge pull request #29 from rw1993/master

we did it!
Merge pull request #30 from rw1993/master

when to end
Finished
Merge pull request #31 from Narcssus/master

Finished
a bug again