Merge pull request #1 from SmilingDevil/development

Fixed routing issues with arguments, oops.