Bug fix

Fix #102 
Fix #103