fixed changes
Merge pull request #19 from brittkistner/mani_branch

fixed changes