Merge pull request #64 from venetianthief/development

Development