Merge pull request #25 from oneski/master

minor changes again....
Merge pull request #8 from wpapper/master

Merge pull request #25 from oneski/master