fixing and simplifying
Merge pull request #13 from kmarsteller/master

fixing and simplifying