sigwo Merge pull request #67 from jupiter-project/dev