Fixed master bugs. Master is currently working.
Created slave mock.
Merge pull request #13 from stbnps/master

Fixed master bugs. Master is currently working. Created slave mock.