added debugging and help options
fixed a forking bug
Merge branch 'master' into bootstrap3