Merge branch 'issue-54' into refactor-stable-cuda
Merge branch 'refactor-stable-cuda' into issue-54