Use a more native approach for inline commands
Merge pull request #30 from metalabdesign/fix_inline_commands

Use a more native approach for inline commands