Merge pull request #18 from iantocristian/master

version 0.2.4