fixed merge mistakes
Merge pull request #11 from kwynns/working

fixed merge mistakes