#11 & #12 fixed. version 1.2
Merge branch 'master' of https://github.com/Luden/Vestbi