Merge pull request #47 from Zarthus/development

Sync development with master.
Merge branch 'master' of github.com:Zarthus/Reconcile into development