Merge pull request #82 from nszoni/main