Merge pull request #2 from dorichan/master

Merge pull request #1 from tdroesch/master
Revert "Added basic scripts"
Merge pull request #3 from tdroesch/revert-1-slave

Revert "Added basic scripts"
Merge pull request #2 from tdroesch/master

Revert back to original