Merge pull request #63 from Surseance/nightly

Nightly merges