nasosi Merge pull request #54 from akumta/patch-3