* Merged duplicate code * Added on/off parameters - closes #120 * Added tab completion for parameters