Merge con issue:26

Close #26