Merge pull request #1 from SmilingDevil/development

Fixed routing issues with arguments, oops.
Merge pull request #2 from SmilingDevil/master

Merge pull request #1 from SmilingDevil/development