0.11b

Little refactoring code