Merge pull request #37 from Askelon/nightly

Update from Nightly
.