Fix

various fix
Merge pull request #72 from 3webit/patch-7

Fix