Merge pull request #1 from siacs/development

Syncing a fork