dselivanov Merge pull request #32 from david-cortes/master