Merge pull request #6 from ochaloup/master

Going to 1.1.0.Final