Merge pull request #1 from nimbusproject/master

Various improvements