Merge pull request #1 from SpencerAnastasio/slave

gios
Merge branch 'master' into slave