Merge pull request #30 from 316k/master

Custom commands issues