pre-merge 1.1
Merge pull request #18 from maximosanz/master

28.03.2014
last one hopefully