Merge pull request #1 from claudius108/master

First push to the new trunk
Merge pull request #3 from claudius108/master

New changes
Merge pull request #4 from claudius108/master

New improvements