20141124 - fixing up
Merge branch 'DEV-01' of github.com:USWSNMBB/Script-Con into DEV-01