fixing errors caused by merging old branch
Merge pull request #10 from SpraggleRock/MASTER_FIX

fixing errors caused by merging old branch