Merge pull request #99 from burlock/development

A saber...