Merge pull request #134 from spali/my_changes