Merge pull request #1 from christophertrudel/master

merge with master
add script support & cleanup a bit
Merge pull request #6 from schuttsm/master

add script support for setup & cleanup the _ between prefix