Merge pull request #7 from ochaloup/master

Going to 1.2.0.Final-SNAPSHOT