Fix #26
Fix 27
Version 1.0.6