Fixed #11
Merge branch 'master' of https://github.com/DRB-IT/blacktiger.git
Fixed #6