Merge pull request #140 from pepelsbey/master

Number of fixes