Add 2 fixes and new shell command
Authored by: Rui Ferreira 2014-02-05
Parent(s): [49eedb]
Child(ren): [605cf8]