Merge pull request #19 from ancagrosan/master

yet another merge
Merge pull request #20 from ancagrosan/master

yet another merge
Merge pull request #12 from darung/master

This is not a merge