fix master problem
Merge pull request #119 from BeshoSmile/fix_master_final

fix master problem