Trying to solve pull-request problem 1_0_0
Trying to solve pull-request problem 1_0_1
Trying to solve pull-request problem 1_0_2
#22. Resolve conflict.
Merge pull request #30 from sergiozt/master

Fixed pull-request problems