Merge pull request #7 from alcatrazia/master

Bugs fixing
fixing bug when appending the list
Fixing conflicts