fix
Merge branch 'master' of https://github.com/jakubka/3whisky.git