Merge pull request #76 from nszoni/main