Closes #31

@javigomez