Merge pull request #11 from iantocristian/master

bug fixes