Merge pull request #79 from nszoni/main