Issue #32 - Fixes and alternate way of issuing commands